Add how-to resolve auto-merge conflict [skip ci] #3965
+15
−0
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.